Remove GtkAction
authorTimm Bäder <mail@baedert.org>
Sun, 16 Oct 2016 18:56:47 +0000 (20:56 +0200)
committerBenjamin Otte <otte@redhat.com>
Mon, 17 Oct 2016 22:34:41 +0000 (00:34 +0200)
gtk/deprecated/Makefile.inc
gtk/deprecated/gtkaction.c [deleted file]
gtk/deprecated/gtkaction.h [deleted file]
gtk/gtk.h
gtk/gtkmenuitemprivate.h
testsuite/gtk/Makefile.am
testsuite/gtk/action.c [deleted file]
testsuite/gtk/builder.c

index 0a6ebb84767bef74697e4722161d8b7b367c876d..1f28597a3c3e8a50454662d0dad66a802ef16359 100644 (file)
@@ -1,5 +1,4 @@
 deprecated_h_sources =                         \
-       deprecated/gtkaction.h          \
        deprecated/gtkgradient.h        \
        deprecated/gtksymboliccolor.h
 
@@ -8,6 +7,5 @@ deprecated_private_h_sources =                  \
        deprecated/gtksymboliccolorprivate.h
 
 deprecated_c_sources =                         \
-       deprecated/gtkaction.c          \
        deprecated/gtkgradient.c        \
        deprecated/gtksymboliccolor.c
diff --git a/gtk/deprecated/gtkaction.c b/gtk/deprecated/gtkaction.c
deleted file mode 100644 (file)
index 55c79a4..0000000
+++ /dev/null
@@ -1,1983 +0,0 @@
-/*
- * GTK - The GIMP Toolkit
- * Copyright (C) 1998, 1999 Red Hat, Inc.
- * All rights reserved.
- *
- * This Library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This Library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * Author: James Henstridge <james@daa.com.au>
- *
- * Modified by the GTK+ Team and others 2003.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-/**
- * SECTION:gtkaction
- * @Short_description: A deprecated action which can be triggered by a menu or toolbar item
- * @Title: GtkAction
- * @See_also: #GtkActionGroup, #GtkUIManager, #GtkActivatable
- *
- * > In GTK+ 3.10, GtkAction has been deprecated. Use #GAction
- * > instead, and associate actions with #GtkActionable widgets. Use
- * > #GMenuModel for creating menus with gtk_menu_new_from_model().
- *
- * Actions represent operations that the user can be perform, along with
- * some information how it should be presented in the interface. Each action
- * provides methods to create icons, menu items and toolbar items
- * representing itself.
- *
- * As well as the callback that is called when the action gets activated,
- * the following also gets associated with the action:
- *
- * - a name (not translated, for path lookup)
- *
- * - a label (translated, for display)
- *
- * - an accelerator
- *
- * - whether label indicates a stock id
- *
- * - a tooltip (optional, translated)
- *
- * - a toolbar label (optional, shorter than label)
- *
- *
- * The action will also have some state information:
- *
- * - visible (shown/hidden)
- *
- * - sensitive (enabled/disabled)
- *
- * Apart from regular actions, there are [toggle actions][GtkToggleAction],
- * which can be toggled between two states and
- * [radio actions][GtkRadioAction], of which only one in a group
- * can be in the “active” state. Other actions can be implemented as #GtkAction
- * subclasses.
- *
- * Each action can have one or more proxy widgets. To act as an action proxy,
- * widget needs to implement #GtkActivatable interface. Proxies mirror the state
- * of the action and should change when the action’s state changes. Properties
- * that are always mirrored by proxies are #GtkAction:sensitive and
- * #GtkAction:visible. #GtkAction:gicon, #GtkAction:icon-name, #GtkAction:label,
- * #GtkAction:short-label and #GtkAction:stock-id properties are only mirorred
- * if proxy widget has #GtkActivatable:use-action-appearance property set to
- * %TRUE.
- *
- * When the proxy is activated, it should activate its action.
- */
-
-#include "config.h"
-
-#define GDK_DISABLE_DEPRECATION_WARNINGS
-
-#include "gtkaction.h"
-#include "gtkactiongroup.h"
-#include "gtkaccellabel.h"
-#include "gtkbutton.h"
-#include "gtkimage.h"
-#include "gtkintl.h"
-#include "gtklabel.h"
-#include "gtkmarshalers.h"
-#include "gtkmenuitem.h"
-#include "gtktoolbutton.h"
-#include "gtktoolbar.h"
-#include "gtkprivate.h"
-#include "gtkbuildable.h"
-
-
-struct _GtkActionPrivate 
-{
-  const gchar *name; /* interned */
-  gchar *label;
-  gchar *short_label;
-  gchar *tooltip;
-  gchar *stock_id; /* stock icon */
-  gchar *icon_name; /* themed icon */
-  GIcon *gicon;
-
-  guint sensitive          : 1;
-  guint visible            : 1;
-  guint label_set          : 1; /* these two used so we can set label */
-  guint short_label_set    : 1; /* based on stock id */
-  guint visible_horizontal : 1;
-  guint visible_vertical   : 1;
-  guint is_important       : 1;
-  guint hide_if_empty      : 1;
-  guint visible_overflown  : 1;
-  guint always_show_image  : 1;
-  guint recursion_guard    : 1;
-  guint activate_blocked   : 1;
-
-  /* accelerator */
-  guint          accel_count;
-  GtkAccelGroup *accel_group;
-  GClosure      *accel_closure;
-  GQuark         accel_quark;
-
-  /* list of proxy widgets */
-  GSList *proxies;
-};
-
-enum 
-{
-  ACTIVATE,
-  LAST_SIGNAL
-};
-
-enum 
-{
-  PROP_0,
-  PROP_NAME,
-  PROP_LABEL,
-  PROP_SHORT_LABEL,
-  PROP_TOOLTIP,
-  PROP_STOCK_ID,
-  PROP_ICON_NAME,
-  PROP_GICON,
-  PROP_VISIBLE_HORIZONTAL,
-  PROP_VISIBLE_VERTICAL,
-  PROP_VISIBLE_OVERFLOWN,
-  PROP_IS_IMPORTANT,
-  PROP_HIDE_IF_EMPTY,
-  PROP_SENSITIVE,
-  PROP_VISIBLE,
-  PROP_ALWAYS_SHOW_IMAGE
-};
-
-/* GtkBuildable */
-static void gtk_action_buildable_init             (GtkBuildableIface *iface);
-static void gtk_action_buildable_set_name         (GtkBuildable *buildable,
-                                                  const gchar  *name);
-static const gchar* gtk_action_buildable_get_name (GtkBuildable *buildable);
-
-G_DEFINE_TYPE_WITH_CODE (GtkAction, gtk_action, G_TYPE_OBJECT,
-                         G_ADD_PRIVATE (GtkAction)
-                        G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
-                                               gtk_action_buildable_init))
-
-static void gtk_action_finalize     (GObject *object);
-static void gtk_action_set_property (GObject         *object,
-                                    guint            prop_id,
-                                    const GValue    *value,
-                                    GParamSpec      *pspec);
-static void gtk_action_get_property (GObject         *object,
-                                    guint            prop_id,
-                                    GValue          *value,
-                                    GParamSpec      *pspec);
-
-static GtkWidget *create_menu_item    (GtkAction *action);
-static GtkWidget *create_tool_item    (GtkAction *action);
-static void       connect_proxy       (GtkAction *action,
-                                      GtkWidget *proxy);
-static void       disconnect_proxy    (GtkAction *action,
-                                      GtkWidget *proxy);
-static void       closure_accel_activate (GClosure     *closure,
-                                         GValue       *return_value,
-                                         guint         n_param_values,
-                                         const GValue *param_values,
-                                         gpointer      invocation_hint,
-                                         gpointer      marshal_data);
-
-static guint         action_signals[LAST_SIGNAL] = { 0 };
-
-
-static void
-gtk_action_class_init (GtkActionClass *klass)
-{
-  GObjectClass *gobject_class;
-
-  gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->finalize     = gtk_action_finalize;
-  gobject_class->set_property = gtk_action_set_property;
-  gobject_class->get_property = gtk_action_get_property;
-
-  klass->activate = NULL;
-
-  klass->create_menu_item  = create_menu_item;
-  klass->create_tool_item  = create_tool_item;
-  klass->create_menu       = NULL;
-  klass->menu_item_type    = GTK_TYPE_MENU_ITEM;
-  klass->toolbar_item_type = GTK_TYPE_TOOL_BUTTON;
-  klass->connect_proxy    = connect_proxy;
-  klass->disconnect_proxy = disconnect_proxy;
-
-  /**
-   * GtkAction:name:
-   *
-   * A unique name for the action.
-   *
-   * Deprecated: 3.10: Use #GAction:name instead
-   */
-  g_object_class_install_property (gobject_class,
-                                  PROP_NAME,
-                                  g_param_spec_string ("name",
-                                                       P_("Name"),
-                                                       P_("A unique name for the action."),
-                                                       NULL,
-                                                       GTK_PARAM_READWRITE | 
-                                                       G_PARAM_CONSTRUCT_ONLY));
-
-  /**
-   * GtkAction:label:
-   *
-   * The label used for menu items and buttons that activate
-   * this action. If the label is %NULL, GTK+ uses the stock 
-   * label specified via the stock-id property.
-   *
-   * This is an appearance property and thus only applies if 
-   * #GtkActivatable:use-action-appearance is %TRUE.
-   *
-   * Deprecated: 3.10: Use the "label" attribute on #GMenuItem instead
-   */
-  g_object_class_install_property (gobject_class,
-                                  PROP_LABEL,
-                                  g_param_spec_string ("label",
-                                                       P_("Label"),
-                                                       P_("The label used for menu items and buttons "
-                                                          "that activate this action."),
-                                                       NULL,
-                                                       GTK_PARAM_READWRITE));
-
-  /**
-   * GtkAction:short-label:
-   *
-   * A shorter label that may be used on toolbar buttons.
-   *
-   * This is an appearance property and thus only applies if 
-   * #GtkActivatable:use-action-appearance is %TRUE.
-   *
-   * Deprecated: 3.10: There is no corresponding replacement when using
-   * #GAction
-   */
-  g_object_class_install_property (gobject_class,
-                                  PROP_SHORT_LABEL,
-                                  g_param_spec_string ("short-label",
-                                                       P_("Short label"),
-                                                       P_("A shorter label that may be used on toolbar buttons."),
-                                                       NULL,
-                                                       GTK_PARAM_READWRITE));
-
-
-  /**
-   * GtkAction:tooltip:
-   *
-   * A tooltip for this action.
-   *
-   * Deprecated: 3.10: Use gtk_widget_set_tooltip_text() instead
-   */
-  g_object_class_install_property (gobject_class,
-                                  PROP_TOOLTIP,
-                                  g_param_spec_string ("tooltip",
-                                                       P_("Tooltip"),
-                                                       P_("A tooltip for this action."),
-                                                       NULL,
-                                                       GTK_PARAM_READWRITE));
-
-  /**
-   * GtkAction:stock-id:
-   *
-   * The stock icon displayed in widgets representing this action.
-   *
-   * This is an appearance property and thus only applies if 
-   * #GtkActivatable:use-action-appearance is %TRUE.
-   *
-   * Deprecated: 3.10: There is no corresponding replacement when using
-   * #GAction
-   */
-  g_object_class_install_property (gobject_class,
-                                  PROP_STOCK_ID,
-                                  g_param_spec_string ("stock-id",
-                                                       P_("Stock Icon"),
-                                                       P_("The stock icon displayed in widgets representing "
-                                                          "this action."),
-                                                       NULL,
-                                                       GTK_PARAM_READWRITE));
-  /**
-   * GtkAction:gicon:
-   *
-   * The #GIcon displayed in the #GtkAction.
-   *
-   * Note that the stock icon is preferred, if the #GtkAction:stock-id 
-   * property holds the id of an existing stock icon.
-   *
-   * This is an appearance property and thus only applies if 
-   * #GtkActivatable:use-action-appearance is %TRUE.
-   *
-   * Since: 2.16
-   *
-   * Deprecated: 3.10: Use the "icon" attribute on a #GMenuItem instead
-   */
-  g_object_class_install_property (gobject_class,
-                                  PROP_GICON,
-                                  g_param_spec_object ("gicon",
-                                                       P_("GIcon"),
-                                                       P_("The GIcon being displayed"),
-                                                       G_TYPE_ICON,
-                                                       GTK_PARAM_READWRITE));                                                  
-  /**
-   * GtkAction:icon-name:
-   *
-   * The name of the icon from the icon theme. 
-   * 
-   * Note that the stock icon is preferred, if the #GtkAction:stock-id 
-   * property holds the id of an existing stock icon, and the #GIcon is
-   * preferred if the #GtkAction:gicon property is set. 
-   *
-   * This is an appearance property and thus only applies if 
-   * #GtkActivatable:use-action-appearance is %TRUE.
-   *
-   * Since: 2.10
-   *
-   * Deprecated: 3.10: Use the "icon" attribute on a #GMenuItem instead
-   */
-  g_object_class_install_property (gobject_class,
-                                  PROP_ICON_NAME,
-                                  g_param_spec_string ("icon-name",
-                                                       P_("Icon Name"),
-                                                       P_("The name of the icon from the icon theme"),
-                                                       NULL,
-                                                       GTK_PARAM_READWRITE));
-
-  /**
-   * GtkAction:visible-horizontal:
-   *
-   * Whether the toolbar item is visible when the toolbar is in a horizontal orientation.
-   *
-   * Deprecated: 3.10: There is no corresponding replacement when using
-   * #GAction
-   */
-  g_object_class_install_property (gobject_class,
-                                  PROP_VISIBLE_HORIZONTAL,
-                                  g_param_spec_boolean ("visible-horizontal",
-                                                        P_("Visible when horizontal"),
-                                                        P_("Whether the toolbar item is visible when the toolbar "
-                                                           "is in a horizontal orientation."),
-                                                        TRUE,
-                                                        GTK_PARAM_READWRITE));
-  /**
-   * GtkAction:visible-overflown:
-   *
-   * When %TRUE, toolitem proxies for this action are represented in the 
-   * toolbar overflow menu.
-   *
-   * Since: 2.6
-   *
-   * Deprecated: 3.10: There is no corresponding replacement when using
-   * #GAction
-   */
-  g_object_class_install_property (gobject_class,
-                                  PROP_VISIBLE_OVERFLOWN,
-                                  g_param_spec_boolean ("visible-overflown",
-                                                        P_("Visible when overflown"),
-                                                        P_("When TRUE, toolitem proxies for this action "
-                                                           "are represented in the toolbar overflow menu."),
-                                                        TRUE,
-                                                        GTK_PARAM_READWRITE));
-
-  /**
-   * GtkAction:visible-vertical:
-   *
-   * Whether the toolbar item is visible when the toolbar is in a vertical orientation.
-   *
-   * Deprecated: 3.10: There is no corresponding replacement when using
-   * #GAction
-   */
-  g_object_class_install_property (gobject_class,
-                                  PROP_VISIBLE_VERTICAL,
-                                  g_param_spec_boolean ("visible-vertical",
-                                                        P_("Visible when vertical"),
-                                                        P_("Whether the toolbar item is visible when the toolbar "
-                                                           "is in a vertical orientation."),
-                                                        TRUE,
-                                                        GTK_PARAM_READWRITE));
-  /**
-   * GtkAction:is-important:
-   *
-   * Whether the action is considered important. When TRUE, toolitem
-   * proxies for this action show text in GTK_TOOLBAR_BOTH_HORIZ mode.
-   *
-   * Deprecated: 3.10: There is no corresponding replacement when using
-   * #GAction
-   */
-  g_object_class_install_property (gobject_class,
-                                  PROP_IS_IMPORTANT,
-                                  g_param_spec_boolean ("is-important",
-                                                        P_("Is important"),
-                                                        P_("Whether the action is considered important. "
-                                                           "When TRUE, toolitem proxies for this action "
-                                                           "show text in GTK_TOOLBAR_BOTH_HORIZ mode."),
-                                                        FALSE,
-                                                        GTK_PARAM_READWRITE));
-  /**
-   * GtkAction:hide-if-empty:
-   *
-   * When TRUE, empty menu proxies for this action are hidden.
-   *
-   * Deprecated: 3.10: There is no corresponding replacement when using
-   * #GAction
-   */
-  g_object_class_install_property (gobject_class,
-                                  PROP_HIDE_IF_EMPTY,
-                                  g_param_spec_boolean ("hide-if-empty",
-                                                        P_("Hide if empty"),
-                                                        P_("When TRUE, empty menu proxies for this action are hidden."),
-                                                        TRUE,
-                                                        GTK_PARAM_READWRITE));
-  /**
-   * GtkAction:sensitive:
-   *
-   * Whether the action is enabled.
-   *
-   * Deprecated: 3.10: Use #GAction:enabled and #GSimpleAction:enabled
-   * instead
-   */
-  g_object_class_install_property (gobject_class,
-                                  PROP_SENSITIVE,
-                                  g_param_spec_boolean ("sensitive",
-                                                        P_("Sensitive"),
-                                                        P_("Whether the action is enabled."),
-                                                        TRUE,
-                                                        GTK_PARAM_READWRITE));
-  /**
-   * GtkAction:visible:
-   *
-   * Whether the action is visible.
-   *
-   * Deprecated: 3.10: There is no corresponding replacement when using
-   * #GAction
-   */
-  g_object_class_install_property (gobject_class,
-                                  PROP_VISIBLE,
-                                  g_param_spec_boolean ("visible",
-                                                        P_("Visible"),
-                                                        P_("Whether the action is visible."),
-                                                        TRUE,
-                                                        GTK_PARAM_READWRITE));
-
-  /**
-   * GtkAction:always-show-image:
-   *
-   * If %TRUE, the action's menu item proxies will ignore the #GtkSettings:gtk-menu-images 
-   * setting and always show their image, if available.
-   *
-   * Use this property if the menu item would be useless or hard to use
-   * without their image. 
-   *
-   * Since: 2.20
-   *
-   * Deprecated: 3.10: There is no corresponding replacement when using
-   * #GAction
-   **/
-  g_object_class_install_property (gobject_class,
-                                   PROP_ALWAYS_SHOW_IMAGE,
-                                   g_param_spec_boolean ("always-show-image",
-                                                         P_("Always show image"),
-                                                         P_("Whether the image will always be shown"),
-                                                         FALSE,
-                                                         GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT));
-
-  /**
-   * GtkAction::activate:
-   * @action: the #GtkAction
-   *
-   * The "activate" signal is emitted when the action is activated.
-   *
-   * Since: 2.4
-   *
-   * Deprecated: 3.10: Use #GSimpleAction::activate instead
-   */
-  action_signals[ACTIVATE] =
-    g_signal_new (I_("activate"),
-                 G_OBJECT_CLASS_TYPE (klass),
-                 G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE,
-                 G_STRUCT_OFFSET (GtkActionClass, activate),  NULL, NULL,
-                 g_cclosure_marshal_VOID__VOID,
-                 G_TYPE_NONE, 0);
-}
-
-
-static void
-gtk_action_init (GtkAction *action)
-{
-  action->private_data = gtk_action_get_instance_private (action);
-
-  action->private_data->name = NULL;
-  action->private_data->label = NULL;
-  action->private_data->short_label = NULL;
-  action->private_data->tooltip = NULL;
-  action->private_data->stock_id = NULL;
-  action->private_data->icon_name = NULL;
-  action->private_data->visible_horizontal = TRUE;
-  action->private_data->visible_vertical   = TRUE;
-  action->private_data->visible_overflown  = TRUE;
-  action->private_data->is_important = FALSE;
-  action->private_data->hide_if_empty = TRUE;
-  action->private_data->always_show_image = FALSE;
-  action->private_data->activate_blocked = FALSE;
-
-  action->private_data->sensitive = TRUE;
-  action->private_data->visible = TRUE;
-
-  action->private_data->label_set = FALSE;
-  action->private_data->short_label_set = FALSE;
-
-  action->private_data->accel_count = 0;
-  action->private_data->accel_group = NULL;
-  action->private_data->accel_quark = 0;
-  action->private_data->accel_closure = 
-    g_closure_new_object (sizeof (GClosure), G_OBJECT (action));
-  g_closure_set_marshal (action->private_data->accel_closure, 
-                        closure_accel_activate);
-  g_closure_ref (action->private_data->accel_closure);
-  g_closure_sink (action->private_data->accel_closure);
-
-  action->private_data->proxies = NULL;
-  action->private_data->gicon = NULL;  
-}
-
-static void
-gtk_action_buildable_init (GtkBuildableIface *iface)
-{
-  iface->set_name = gtk_action_buildable_set_name;
-  iface->get_name = gtk_action_buildable_get_name;
-}
-
-static void
-gtk_action_buildable_set_name (GtkBuildable *buildable,
-                              const gchar  *name)
-{
-  GtkAction *action = GTK_ACTION (buildable);
-
-  action->private_data->name = g_intern_string (name);
-}
-
-static const gchar *
-gtk_action_buildable_get_name (GtkBuildable *buildable)
-{
-  GtkAction *action = GTK_ACTION (buildable);
-
-  return action->private_data->name;
-}
-
-/**
- * gtk_action_new:
- * @name: A unique name for the action
- * @label: (allow-none): the label displayed in menu items and on buttons,
- *         or %NULL
- * @tooltip: (allow-none): a tooltip for the action, or %NULL
- * @stock_id: (allow-none): the stock icon to display in widgets representing
- *            the action, or %NULL
- *
- * Creates a new #GtkAction object. To add the action to a
- * #GtkActionGroup and set the accelerator for the action,
- * call gtk_action_group_add_action_with_accel().
- * See the [UI Definition section][XML-UI] for information on allowed action
- * names.
- *
- * Returns: a new #GtkAction
- *
- * Since: 2.4
- *
- * Deprecated: 3.10: Use #GAction instead, associating it to a widget with
- * #GtkActionable or creating a #GtkMenu with gtk_menu_new_from_model()
- */
-GtkAction *
-gtk_action_new (const gchar *name,
-               const gchar *label,
-               const gchar *tooltip,
-               const gchar *stock_id)
-{
-  g_return_val_if_fail (name != NULL, NULL);
-
-  return g_object_new (GTK_TYPE_ACTION,
-                       "name", name,
-                      "label", label,
-                      "tooltip", tooltip,
-                      "stock-id", stock_id,
-                      NULL);
-}
-
-static void
-gtk_action_finalize (GObject *object)
-{
-  GtkAction *action;
-  action = GTK_ACTION (object);
-
-  g_free (action->private_data->label);
-  g_free (action->private_data->short_label);
-  g_free (action->private_data->tooltip);
-  g_free (action->private_data->stock_id);
-  g_free (action->private_data->icon_name);
-  
-  if (action->private_data->gicon)
-    g_object_unref (action->private_data->gicon);
-
-  g_closure_unref (action->private_data->accel_closure);
-  if (action->private_data->accel_group)
-    g_object_unref (action->private_data->accel_group);
-
-  G_OBJECT_CLASS (gtk_action_parent_class)->finalize (object);  
-}
-
-static void
-gtk_action_set_property (GObject         *object,
-                        guint            prop_id,
-                        const GValue    *value,
-                        GParamSpec      *pspec)
-{
-  GtkAction *action;
-  
-  action = GTK_ACTION (object);
-
-  switch (prop_id)
-    {
-    case PROP_NAME:
-      action->private_data->name = g_intern_string (g_value_get_string (value));
-      break;
-    case PROP_LABEL:
-      gtk_action_set_label (action, g_value_get_string (value));
-      break;
-    case PROP_SHORT_LABEL:
-      gtk_action_set_short_label (action, g_value_get_string (value));
-      break;
-    case PROP_TOOLTIP:
-      gtk_action_set_tooltip (action, g_value_get_string (value));
-      break;
-    case PROP_STOCK_ID:
-      gtk_action_set_stock_id (action, g_value_get_string (value));
-      break;
-    case PROP_GICON:
-      gtk_action_set_gicon (action, g_value_get_object (value));
-      break;
-    case PROP_ICON_NAME:
-      gtk_action_set_icon_name (action, g_value_get_string (value));
-      break;
-    case PROP_VISIBLE_HORIZONTAL:
-      gtk_action_set_visible_horizontal (action, g_value_get_boolean (value));
-      break;
-    case PROP_VISIBLE_VERTICAL:
-      gtk_action_set_visible_vertical (action, g_value_get_boolean (value));
-      break;
-    case PROP_VISIBLE_OVERFLOWN:
-      action->private_data->visible_overflown = g_value_get_boolean (value);
-      break;
-    case PROP_IS_IMPORTANT:
-      gtk_action_set_is_important (action, g_value_get_boolean (value));
-      break;
-    case PROP_HIDE_IF_EMPTY:
-      action->private_data->hide_if_empty = g_value_get_boolean (value);
-      break;
-    case PROP_SENSITIVE:
-      gtk_action_set_sensitive (action, g_value_get_boolean (value));
-      break;
-    case PROP_VISIBLE:
-      gtk_action_set_visible (action, g_value_get_boolean (value));
-      break;
-    case PROP_ALWAYS_SHOW_IMAGE:
-      gtk_action_set_always_show_image (action, g_value_get_boolean (value));
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_action_get_property (GObject    *object,
-                        guint       prop_id,
-                        GValue     *value,
-                        GParamSpec *pspec)
-{
-  GtkAction *action;
-
-  action = GTK_ACTION (object);
-
-  switch (prop_id)
-    {
-    case PROP_NAME:
-      g_value_set_static_string (value, action->private_data->name);
-      break;
-    case PROP_LABEL:
-      g_value_set_string (value, action->private_data->label);
-      break;
-    case PROP_SHORT_LABEL:
-      g_value_set_string (value, action->private_data->short_label);
-      break;
-    case PROP_TOOLTIP:
-      g_value_set_string (value, action->private_data->tooltip);
-      break;
-    case PROP_STOCK_ID:
-      g_value_set_string (value, action->private_data->stock_id);
-      break;
-    case PROP_ICON_NAME:
-      g_value_set_string (value, action->private_data->icon_name);
-      break;
-    case PROP_GICON:
-      g_value_set_object (value, action->private_data->gicon);
-      break;
-    case PROP_VISIBLE_HORIZONTAL:
-      g_value_set_boolean (value, action->private_data->visible_horizontal);
-      break;
-    case PROP_VISIBLE_VERTICAL:
-      g_value_set_boolean (value, action->private_data->visible_vertical);
-      break;
-    case PROP_VISIBLE_OVERFLOWN:
-      g_value_set_boolean (value, action->private_data->visible_overflown);
-      break;
-    case PROP_IS_IMPORTANT:
-      g_value_set_boolean (value, action->private_data->is_important);
-      break;
-    case PROP_HIDE_IF_EMPTY:
-      g_value_set_boolean (value, action->private_data->hide_if_empty);
-      break;
-    case PROP_SENSITIVE:
-      g_value_set_boolean (value, action->private_data->sensitive);
-      break;
-    case PROP_VISIBLE:
-      g_value_set_boolean (value, action->private_data->visible);
-      break;
-    case PROP_ALWAYS_SHOW_IMAGE:
-      g_value_set_boolean (value, action->private_data->always_show_image);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static GtkWidget *
-create_menu_item (GtkAction *action)
-{
-  GType menu_item_type;
-
-  menu_item_type = GTK_ACTION_GET_CLASS (action)->menu_item_type;
-
-  return g_object_new (menu_item_type, NULL);
-}
-
-static GtkWidget *
-create_tool_item (GtkAction *action)
-{
-  GType toolbar_item_type;
-
-  toolbar_item_type = GTK_ACTION_GET_CLASS (action)->toolbar_item_type;
-
-  return g_object_new (toolbar_item_type, NULL);
-}
-
-static void
-remove_proxy (GtkAction *action,
-             GtkWidget *proxy)
-{
-  g_object_unref (proxy);
-  action->private_data->proxies = g_slist_remove (action->private_data->proxies, proxy);
-}
-
-static void
-connect_proxy (GtkAction *action,
-              GtkWidget *proxy)
-{
-  action->private_data->proxies = g_slist_prepend (action->private_data->proxies, proxy);
-
-  g_object_ref_sink (proxy);
-
-}
-
-static void
-disconnect_proxy (GtkAction *action,
-                 GtkWidget *proxy)
-{
-  remove_proxy (action, proxy);
-}
-
-
-/**
- * _gtk_action_sync_menu_visible:
- * @action: (allow-none): a #GtkAction, or %NULL to determine the action from @proxy
- * @proxy: a proxy menu item
- * @empty: whether the submenu attached to @proxy is empty
- * 
- * Updates the visibility of @proxy from the visibility of @action
- * according to the following rules:
-
- * - if @action is invisible, @proxy is too
- *
- * - if @empty is %TRUE, hide @proxy unless the “hide-if-empty”
- *   property of @action indicates otherwise
- *
- * This function is used in the implementation of #GtkUIManager.
- *
- * Deprecated: 3.10
- **/
-void
-_gtk_action_sync_menu_visible (GtkAction *action,
-                              GtkWidget *proxy,
-                              gboolean   empty)
-{
-  gboolean visible = TRUE;
-  gboolean hide_if_empty = TRUE;
-
-  g_return_if_fail (GTK_IS_MENU_ITEM (proxy));
-  g_return_if_fail (action == NULL || GTK_IS_ACTION (action));
-
-  if (action)
-    {
-      /* a GtkMenu for a <popup/> doesn't have to have an action */
-      visible = gtk_action_is_visible (action);
-      hide_if_empty = action->private_data->hide_if_empty;
-    }
-
-  if (visible && !(empty && hide_if_empty))
-    gtk_widget_show (proxy);
-  else
-    gtk_widget_hide (proxy);
-}
-
-void
-_gtk_action_emit_activate (GtkAction *action)
-{
-}
-
-/**
- * gtk_action_activate:
- * @action: the action object
- *
- * Emits the “activate” signal on the specified action, if it isn't
- * insensitive. This gets called by the proxy widgets when they get 
- * activated.
- *
- * It can also be used to manually activate an action.
- *
- * Since: 2.4
- *
- * Deprecated: 3.10: Use g_action_group_activate_action() on a #GAction instead
- */
-void
-gtk_action_activate (GtkAction *action)
-{
-  g_return_if_fail (GTK_IS_ACTION (action));
-  
-  if (action->private_data->activate_blocked)
-    return;
-
-  if (gtk_action_is_sensitive (action))
-    _gtk_action_emit_activate (action);
-}
-
-/**
- * gtk_action_block_activate:
- * @action: a #GtkAction
- *
- * Disable activation signals from the action 
- *
- * This is needed when updating the state of your proxy
- * #GtkActivatable widget could result in calling gtk_action_activate(),
- * this is a convenience function to avoid recursing in those
- * cases (updating toggle state for instance).
- *
- * Since: 2.16
- *
- * Deprecated: 3.10: Use g_simple_action_set_enabled() to disable the
- * #GSimpleAction instead
- */
-void
-gtk_action_block_activate (GtkAction *action)
-{
-  g_return_if_fail (GTK_IS_ACTION (action));
-
-  action->private_data->activate_blocked = TRUE;
-}
-
-/**
- * gtk_action_unblock_activate:
- * @action: a #GtkAction
- *
- * Reenable activation signals from the action 
- *
- * Since: 2.16
- *
- * Deprecated: 3.10: Use g_simple_action_set_enabled() to enable the
- * #GSimpleAction instead
- */
-void
-gtk_action_unblock_activate (GtkAction *action)
-{
-  g_return_if_fail (GTK_IS_ACTION (action));
-
-  action->private_data->activate_blocked = FALSE;
-}
-
-/**
- * gtk_action_create_icon:
- * @action: the action object
- * @icon_size: (type int): the size of the icon (#GtkIconSize) that should
- *      be created.
- *
- * This function is intended for use by action implementations to
- * create icons displayed in the proxy widgets.
- *
- * Returns: (transfer none): a widget that displays the icon for this action.
- *
- * Since: 2.4
- *
- * Deprecated: 3.10: Use g_menu_item_set_icon() to set an icon on a #GMenuItem,
- * or gtk_container_add() to add a #GtkImage to a #GtkButton
- */
-GtkWidget *
-gtk_action_create_icon (GtkAction *action, GtkIconSize icon_size)
-{
-  GtkWidget *widget = NULL;
-
-  g_return_val_if_fail (GTK_IS_ACTION (action), NULL);
-
-  if (action->private_data->gicon)
-    widget = gtk_image_new_from_gicon (action->private_data->gicon, icon_size);
-  else if (action->private_data->icon_name)
-    widget = gtk_image_new_from_icon_name (action->private_data->icon_name, icon_size);
-
-  return widget;
-}
-
-/**
- * gtk_action_create_menu_item:
- * @action: the action object
- *
- * Creates a menu item widget that proxies for the given action.
- *
- * Returns: (transfer none): a menu item connected to the action.
- *
- * Since: 2.4
- *
- * Deprecated: 3.10: Use g_menu_item_new() and associate it with a #GAction
- * instead.
- */
-GtkWidget *
-gtk_action_create_menu_item (GtkAction *action)
-{
-  GtkWidget *menu_item;
-
-  g_return_val_if_fail (GTK_IS_ACTION (action), NULL);
-
-  menu_item = GTK_ACTION_GET_CLASS (action)->create_menu_item (action);
-
-  return menu_item;
-}
-
-/**
- * gtk_action_create_tool_item:
- * @action: the action object
- *
- * Creates a toolbar item widget that proxies for the given action.
- *
- * Returns: (transfer none): a toolbar item connected to the action.
- *
- * Since: 2.4
- *
- * Deprecated: 3.10: Use a #GtkToolItem and associate it with a #GAction using
- * gtk_actionable_set_action_name() instead
- */
-GtkWidget *
-gtk_action_create_tool_item (GtkAction *action)
-{
-  GtkWidget *button;
-
-  g_return_val_if_fail (GTK_IS_ACTION (action), NULL);
-
-  button = GTK_ACTION_GET_CLASS (action)->create_tool_item (action);
-
-  return button;
-}
-
-void
-_gtk_action_add_to_proxy_list (GtkAction     *action,
-                              GtkWidget     *proxy)
-{
-  g_return_if_fail (GTK_IS_ACTION (action));
-  g_return_if_fail (GTK_IS_WIDGET (proxy));
-  GTK_ACTION_GET_CLASS (action)->connect_proxy (action, proxy);
-}
-
-void
-_gtk_action_remove_from_proxy_list (GtkAction     *action,
-                                   GtkWidget     *proxy)
-{
-  g_return_if_fail (GTK_IS_ACTION (action));
-  g_return_if_fail (GTK_IS_WIDGET (proxy));
-
-  GTK_ACTION_GET_CLASS (action)->disconnect_proxy (action, proxy);
-}
-
-/**
- * gtk_action_get_proxies:
- * @action: the action object
- * 
- * Returns the proxy widgets for an action.
- * See also gtk_activatable_get_related_action().
- *
- * Returns: (element-type GtkWidget) (transfer none): a #GSList of proxy widgets. The list is owned by GTK+
- * and must not be modified.
- *
- * Since: 2.4
- *
- * Deprecated: 3.10
- **/
-GSList*
-gtk_action_get_proxies (GtkAction *action)
-{
-  g_return_val_if_fail (GTK_IS_ACTION (action), NULL);
-
-  return action->private_data->proxies;
-}
-
-/**
- * gtk_action_get_name:
- * @action: the action object
- * 
- * Returns the name of the action.
- * 
- * Returns: the name of the action. The string belongs to GTK+ and should not
- *   be freed.
- *
- * Since: 2.4
- *
- * Deprecated: 3.10: Use g_action_get_name() on a #GAction instead
- **/
-const gchar *
-gtk_action_get_name (GtkAction *action)
-{
-  g_return_val_if_fail (GTK_IS_ACTION (action), NULL);
-
-  return action->private_data->name;
-}
-
-/**
- * gtk_action_is_sensitive:
- * @action: the action object
- * 
- * Returns whether the action is effectively sensitive.
- *
- * Returns: %TRUE if the action and its associated action group 
- * are both sensitive.
- *
- * Since: 2.4
- *
- * Deprecated: 3.10: Use g_action_get_enabled() on a #GAction
- * instead
- **/
-gboolean
-gtk_action_is_sensitive (GtkAction *action)
-{
-  GtkActionPrivate *priv;
-  g_return_val_if_fail (GTK_IS_ACTION (action), FALSE);
-
-  priv = action->private_data;
-  return priv->sensitive;
-}
-
-/**
- * gtk_action_get_sensitive:
- * @action: the action object
- * 
- * Returns whether the action itself is sensitive. Note that this doesn’t 
- * necessarily mean effective sensitivity. See gtk_action_is_sensitive() 
- * for that.
- *
- * Returns: %TRUE if the action itself is sensitive.
- *
- * Since: 2.4
- *
- * Deprecated: 3.10: Use g_action_get_enabled() on a #GAction
- * instead
- **/
-gboolean
-gtk_action_get_sensitive (GtkAction *action)
-{
-  g_return_val_if_fail (GTK_IS_ACTION (action), FALSE);
-
-  return action->private_data->sensitive;
-}
-
-/**
- * gtk_action_set_sensitive:
- * @action: the action object
- * @sensitive: %TRUE to make the action sensitive
- * 
- * Sets the :sensitive property of the action to @sensitive. Note that 
- * this doesn’t necessarily mean effective sensitivity. See 
- * gtk_action_is_sensitive() 
- * for that.
- *
- * Since: 2.6
- *
- * Deprecated: 3.10: Use g_simple_action_set_enabled() on a #GSimpleAction
- * instead
- **/
-void
-gtk_action_set_sensitive (GtkAction *action,
-                         gboolean   sensitive)
-{
-  g_return_if_fail (GTK_IS_ACTION (action));
-
-  sensitive = sensitive != FALSE;
-  
-  if (action->private_data->sensitive != sensitive)
-    {
-      action->private_data->sensitive = sensitive;
-
-      g_object_notify (G_OBJECT (action), "sensitive");
-    }
-}
-
-/**
- * gtk_action_is_visible:
- * @action: the action object
- * 
- * Returns whether the action is effectively visible.
- *
- * Returns: %TRUE if the action and its associated action group 
- * are both visible.
- *
- * Since: 2.4
- *
- * Deprecated: 3.10: Use #GAction instead, and control and monitor the state of
- * #GtkActionable widgets directly
- **/
-gboolean
-gtk_action_is_visible (GtkAction *action)
-{
-  GtkActionPrivate *priv;
-  g_return_val_if_fail (GTK_IS_ACTION (action), FALSE);
-
-  priv = action->private_data;
-  return priv->visible;
-}
-
-/**
- * gtk_action_get_visible:
- * @action: the action object
- * 
- * Returns whether the action itself is visible. Note that this doesn’t 
- * necessarily mean effective visibility. See gtk_action_is_sensitive() 
- * for that.
- *
- * Returns: %TRUE if the action itself is visible.
- *
- * Since: 2.4
- *
- * Deprecated: 3.10: Use #GAction instead, and control and monitor the state of
- * #GtkActionable widgets directly
- **/
-gboolean
-gtk_action_get_visible (GtkAction *action)
-{
-  g_return_val_if_fail (GTK_IS_ACTION (action), FALSE);
-
-  return action->private_data->visible;
-}
-
-/**
- * gtk_action_set_visible:
- * @action: the action object
- * @visible: %TRUE to make the action visible
- * 
- * Sets the :visible property of the action to @visible. Note that 
- * this doesn’t necessarily mean effective visibility. See 
- * gtk_action_is_visible() 
- * for that.
- *
- * Since: 2.6
- *
- * Deprecated: 3.10: Use #GAction instead, and control and monitor the state of
- * #GtkActionable widgets directly
- **/
-void
-gtk_action_set_visible (GtkAction *action,
-                       gboolean   visible)
-{
-  g_return_if_fail (GTK_IS_ACTION (action));
-
-  visible = visible != FALSE;
-  
-  if (action->private_data->visible != visible)
-    {
-      action->private_data->visible = visible;
-
-      g_object_notify (G_OBJECT (action), "visible");
-    }
-}
-/**
- * gtk_action_set_is_important:
- * @action: the action object
- * @is_important: %TRUE to make the action important
- *
- * Sets whether the action is important, this attribute is used
- * primarily by toolbar items to decide whether to show a label
- * or not.
- *
- * Since: 2.16
- *
- * Deprecated: 3.10: Use #GAction instead, and control and monitor whether
- * labels are shown directly
- */
-void 
-gtk_action_set_is_important (GtkAction *action,
-                            gboolean   is_important)
-{
-  g_return_if_fail (GTK_IS_ACTION (action));
-
-  is_important = is_important != FALSE;
-  
-  if (action->private_data->is_important != is_important)
-    {
-      action->private_data->is_important = is_important;
-      
-      g_object_notify (G_OBJECT (action), "is-important");
-    }  
-}
-
-/**
- * gtk_action_get_is_important:
- * @action: a #GtkAction
- *
- * Checks whether @action is important or not
- * 
- * Returns: whether @action is important
- *
- * Since: 2.16
- *
- * Deprecated: 3.10: Use #GAction instead, and control and monitor whether
- * labels are shown directly
- */
-gboolean 
-gtk_action_get_is_important (GtkAction *action)
-{
-  g_return_val_if_fail (GTK_IS_ACTION (action), FALSE);
-
-  return action->private_data->is_important;
-}
-
-/**
- * gtk_action_set_always_show_image:
- * @action: a #GtkAction
- * @always_show: %TRUE if menuitem proxies should always show their image
- *
- * Sets whether @action's menu item proxies will ignore the
- * #GtkSettings:gtk-menu-images setting and always show their image, if available.
- *
- * Use this if the menu item would be useless or hard to use
- * without their image.
- *
- * Since: 2.20
- *
- * Deprecated: 3.10: Use g_menu_item_set_icon() on a #GMenuItem instead, if the
- * item should have an image
- */
-void
-gtk_action_set_always_show_image (GtkAction *action,
-                                  gboolean   always_show)
-{
-  GtkActionPrivate *priv;
-
-  g_return_if_fail (GTK_IS_ACTION (action));
-
-  priv = action->private_data;
-
-  always_show = always_show != FALSE;
-  
-  if (priv->always_show_image != always_show)
-    {
-      priv->always_show_image = always_show;
-
-      g_object_notify (G_OBJECT (action), "always-show-image");
-    }
-}
-
-/**
- * gtk_action_get_always_show_image:
- * @action: a #GtkAction
- *
- * Returns whether @action's menu item proxies will always
- * show their image, if available.
- *
- * Returns: %TRUE if the menu item proxies will always show their image
- *
- * Since: 2.20
- *
- * Deprecated: 3.10: Use g_menu_item_get_attribute_value() on a #GMenuItem
- * instead
- */
-gboolean
-gtk_action_get_always_show_image  (GtkAction *action)
-{
-  g_return_val_if_fail (GTK_IS_ACTION (action), FALSE);
-
-  return action->private_data->always_show_image;
-}
-
-/**
- * gtk_action_set_label:
- * @action: a #GtkAction
- * @label: the label text to set
- *
- * Sets the label of @action.
- *
- * Since: 2.16
- *
- * Deprecated: 3.10: Use #GAction instead, and set a label on a menu item with
- * g_menu_item_set_label(). For #GtkActionable widgets, use the widget-specific
- * API to set a label
- */
-void 
-gtk_action_set_label (GtkAction          *action,
-                     const gchar *label)
-{
-  gchar *tmp;
-  
-  g_return_if_fail (GTK_IS_ACTION (action));
-  
-  tmp = action->private_data->label;
-  action->private_data->label = g_strdup (label);
-  g_free (tmp);
-  action->private_data->label_set = (action->private_data->label != NULL);
-  /* if label is unset, then use the label from the stock item */
-  if (!action->private_data->label_set && action->private_data->stock_id)
-    {
-
-      G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-
-      G_GNUC_END_IGNORE_DEPRECATIONS;
-    }
-
-  g_object_notify (G_OBJECT (action), "label");
-  
-  /* if short_label is unset, set short_label=label */
-  if (!action->private_data->short_label_set)
-    {
-      gtk_action_set_short_label (action, action->private_data->label);
-      action->private_data->short_label_set = FALSE;
-    }
-}
-
-/**
- * gtk_action_get_label:
- * @action: a #GtkAction
- *
- * Gets the label text of @action.
- *
- * Returns: the label text
- *
- * Since: 2.16
- *
- * Deprecated: 3.10: Use #GAction instead, and get a label from a menu item
- * with g_menu_item_get_attribute_value(). For #GtkActionable widgets, use the
- * widget-specific API to get a label
- */
-const gchar *
-gtk_action_get_label (GtkAction *action)
-{
-  g_return_val_if_fail (GTK_IS_ACTION (action), NULL);
-
-  return action->private_data->label;
-}
-
-/**
- * gtk_action_set_short_label:
- * @action: a #GtkAction
- * @short_label: the label text to set
- *
- * Sets a shorter label text on @action.
- *
- * Since: 2.16
- *
- * Deprecated: 3.10: Use #GAction instead, which has no equivalent of short
- * labels
- */
-void 
-gtk_action_set_short_label (GtkAction   *action,
-                           const gchar *short_label)
-{
-  gchar *tmp;
-
-  g_return_if_fail (GTK_IS_ACTION (action));
-
-  tmp = action->private_data->short_label;
-  action->private_data->short_label = g_strdup (short_label);
-  g_free (tmp);
-  action->private_data->short_label_set = (action->private_data->short_label != NULL);
-  /* if short_label is unset, then use the value of label */
-  if (!action->private_data->short_label_set)
-    action->private_data->short_label = g_strdup (action->private_data->label);
-
-  g_object_notify (G_OBJECT (action), "short-label");
-}
-
-/**
- * gtk_action_get_short_label:
- * @action: a #GtkAction
- *
- * Gets the short label text of @action.
- *
- * Returns: the short label text.
- *
- * Since: 2.16
- *
- * Deprecated: 3.10: Use #GAction instead, which has no equivalent of short
- * labels
- */
-const gchar *
-gtk_action_get_short_label (GtkAction *action)
-{
-  g_return_val_if_fail (GTK_IS_ACTION (action), NULL);
-
-  return action->private_data->short_label;
-}
-
-/**
- * gtk_action_set_visible_horizontal:
- * @action: a #GtkAction
- * @visible_horizontal: whether the action is visible horizontally
- *
- * Sets whether @action is visible when horizontal
- *
- * Since: 2.16
- *
- * Deprecated: 3.10: Use #GAction instead, and control and monitor the
- * visibility of associated widgets and menu items directly
- */
-void 
-gtk_action_set_visible_horizontal (GtkAction *action,
-                                  gboolean   visible_horizontal)
-{
-  g_return_if_fail (GTK_IS_ACTION (action));
-
-  g_return_if_fail (GTK_IS_ACTION (action));
-
-  visible_horizontal = visible_horizontal != FALSE;
-  
-  if (action->private_data->visible_horizontal != visible_horizontal)
-    {
-      action->private_data->visible_horizontal = visible_horizontal;
-      
-      g_object_notify (G_OBJECT (action), "visible-horizontal");
-    }  
-}
-
-/**
- * gtk_action_get_visible_horizontal:
- * @action: a #GtkAction
- *
- * Checks whether @action is visible when horizontal
- * 
- * Returns: whether @action is visible when horizontal
- *
- * Since: 2.16
- *
- * Deprecated: 3.10: Use #GAction instead, and control and monitor the
- * visibility of associated widgets and menu items directly
- */
-gboolean 
-gtk_action_get_visible_horizontal (GtkAction *action)
-{
-  g_return_val_if_fail (GTK_IS_ACTION (action), FALSE);
-
-  return action->private_data->visible_horizontal;
-}
-
-/**
- * gtk_action_set_visible_vertical:
- * @action: a #GtkAction
- * @visible_vertical: whether the action is visible vertically
- *
- * Sets whether @action is visible when vertical 
- *
- * Since: 2.16
- *
- * Deprecated: 3.10: Use #GAction instead, and control and monitor the
- * visibility of associated widgets and menu items directly
- */
-void 
-gtk_action_set_visible_vertical (GtkAction *action,
-                                gboolean   visible_vertical)
-{
-  g_return_if_fail (GTK_IS_ACTION (action));
-
-  g_return_if_fail (GTK_IS_ACTION (action));
-
-  visible_vertical = visible_vertical != FALSE;
-  
-  if (action->private_data->visible_vertical != visible_vertical)
-    {
-      action->private_data->visible_vertical = visible_vertical;
-      
-      g_object_notify (G_OBJECT (action), "visible-vertical");
-    }  
-}
-
-/**
- * gtk_action_get_visible_vertical:
- * @action: a #GtkAction
- *
- * Checks whether @action is visible when horizontal
- * 
- * Returns: whether @action is visible when horizontal
- *
- * Since: 2.16
- *
- * Deprecated: 3.10: Use #GAction instead, and control and monitor the
- * visibility of associated widgets and menu items directly
- */
-gboolean 
-gtk_action_get_visible_vertical (GtkAction *action)
-{
-  g_return_val_if_fail (GTK_IS_ACTION (action), FALSE);
-
-  return action->private_data->visible_vertical;
-}
-
-/**
- * gtk_action_set_tooltip:
- * @action: a #GtkAction
- * @tooltip: the tooltip text
- *
- * Sets the tooltip text on @action
- *
- * Since: 2.16
- *
- * Deprecated: 3.10: Use #GAction instead, and set tooltips on associated
- * #GtkActionable widgets with gtk_widget_set_tooltip_text()
- */
-void 
-gtk_action_set_tooltip (GtkAction   *action,
-                       const gchar *tooltip)
-{
-  gchar *tmp;
-
-  g_return_if_fail (GTK_IS_ACTION (action));
-
-  tmp = action->private_data->tooltip;
-  action->private_data->tooltip = g_strdup (tooltip);
-  g_free (tmp);
-
-  g_object_notify (G_OBJECT (action), "tooltip");
-}
-
-/**
- * gtk_action_get_tooltip:
- * @action: a #GtkAction
- *
- * Gets the tooltip text of @action.
- *
- * Returns: the tooltip text
- *
- * Since: 2.16
- *
- * Deprecated: 3.10: Use #GAction instead, and get tooltips from associated
- * #GtkActionable widgets with gtk_widget_get_tooltip_text()
- */
-const gchar *
-gtk_action_get_tooltip (GtkAction *action)
-{
-  g_return_val_if_fail (GTK_IS_ACTION (action), NULL);
-
-  return action->private_data->tooltip;
-}
-
-/**
- * gtk_action_set_stock_id:
- * @action: a #GtkAction
- * @stock_id: the stock id
- *
- * Sets the stock id on @action
- *
- * Since: 2.16
- *
- * Deprecated: 3.10: Use #GAction instead, which has no equivalent of stock
- * items
- */
-void 
-gtk_action_set_stock_id (GtkAction   *action,
-                        const gchar *stock_id)
-{
-  gchar *tmp;
-
-  g_return_if_fail (GTK_IS_ACTION (action));
-
-  g_return_if_fail (GTK_IS_ACTION (action));
-
-  tmp = action->private_data->stock_id;
-  action->private_data->stock_id = g_strdup (stock_id);
-  g_free (tmp);
-
-  g_object_notify (G_OBJECT (action), "stock-id");
-  
-  /* update label and short_label if appropriate */
-  if (!action->private_data->label_set)
-    {
-
-      G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-
-       gtk_action_set_label (action, NULL);
-
-      G_GNUC_END_IGNORE_DEPRECATIONS;
-
-      action->private_data->label_set = FALSE;
-    }
-}
-
-/**
- * gtk_action_get_stock_id:
- * @action: a #GtkAction
- *
- * Gets the stock id of @action.
- *
- * Returns: the stock id
- *
- * Since: 2.16
- *
- * Deprecated: 3.10: Use #GAction instead, which has no equivalent of stock
- * items
- */
-const gchar *
-gtk_action_get_stock_id (GtkAction *action)
-{
-  g_return_val_if_fail (GTK_IS_ACTION (action), NULL);
-
-  return action->private_data->stock_id;
-}
-
-/**
- * gtk_action_set_icon_name:
- * @action: a #GtkAction
- * @icon_name: the icon name to set
- *
- * Sets the icon name on @action
- *
- * Since: 2.16
- *
- * Deprecated: 3.10: Use #GAction instead, and g_menu_item_set_icon() to set an
- * icon on a #GMenuItem associated with a #GAction, or gtk_container_add() to
- * add a #GtkImage to a #GtkButton
- */
-void 
-gtk_action_set_icon_name (GtkAction   *action,
-                         const gchar *icon_name)
-{
-  gchar *tmp;
-
-  g_return_if_fail (GTK_IS_ACTION (action));
-
-  tmp = action->private_data->icon_name;
-  action->private_data->icon_name = g_strdup (icon_name);
-  g_free (tmp);
-
-  g_object_notify (G_OBJECT (action), "icon-name");
-}
-
-/**
- * gtk_action_get_icon_name:
- * @action: a #GtkAction
- *
- * Gets the icon name of @action.
- *
- * Returns: the icon name
- *
- * Since: 2.16
- *
- * Deprecated: 3.10: Use #GAction instead, and
- * g_menu_item_get_attribute_value() to get an icon from a #GMenuItem
- * associated with a #GAction
- */
-const gchar *
-gtk_action_get_icon_name (GtkAction *action)
-{
-  g_return_val_if_fail (GTK_IS_ACTION (action), NULL);
-
-  return action->private_data->icon_name;
-}
-
-/**
- * gtk_action_set_gicon:
- * @action: a #GtkAction
- * @icon: the #GIcon to set
- *
- * Sets the icon of @action.
- *
- * Since: 2.16
- *
- * Deprecated: 3.10: Use #GAction instead, and g_menu_item_set_icon() to set an
- * icon on a #GMenuItem associated with a #GAction, or gtk_container_add() to
- * add a #GtkImage to a #GtkButton
- */
-void
-gtk_action_set_gicon (GtkAction *action,
-                      GIcon     *icon)
-{
-  g_return_if_fail (GTK_IS_ACTION (action));
-
-  if (action->private_data->gicon)
-    g_object_unref (action->private_data->gicon);
-
-  action->private_data->gicon = icon;
-
-  if (action->private_data->gicon)
-    g_object_ref (action->private_data->gicon);
-
-  g_object_notify (G_OBJECT (action), "gicon");
-}
-
-/**
- * gtk_action_get_gicon:
- * @action: a #GtkAction
- *
- * Gets the gicon of @action.
- *
- * Returns: (transfer none): The action’s #GIcon if one is set.
- *
- * Since: 2.16
- *
- * Deprecated: 3.10: Use #GAction instead, and
- * g_menu_item_get_attribute_value() to get an icon from a #GMenuItem
- * associated with a #GAction
- */
-GIcon *
-gtk_action_get_gicon (GtkAction *action)
-{
-  g_return_val_if_fail (GTK_IS_ACTION (action), NULL);
-
-  return action->private_data->gicon;
-}
-
-static void
-closure_accel_activate (GClosure     *closure,
-                        GValue       *return_value,
-                        guint         n_param_values,
-                        const GValue *param_values,
-                        gpointer      invocation_hint,
-                        gpointer      marshal_data)
-{
-  if (gtk_action_is_sensitive (GTK_ACTION (closure->data)))
-    {
-      _gtk_action_emit_activate (GTK_ACTION (closure->data));
-      
-      /* we handled the accelerator */
-      g_value_set_boolean (return_value, TRUE);
-    }
-}
-
-
-/**
- * gtk_action_set_accel_path:
- * @action: the action object
- * @accel_path: the accelerator path
- *
- * Sets the accel path for this action.  All proxy widgets associated
- * with the action will have this accel path, so that their
- * accelerators are consistent.
- *
- * Note that @accel_path string will be stored in a #GQuark. Therefore, if you
- * pass a static string, you can save some memory by interning it first with 
- * g_intern_static_string().
- *
- * Since: 2.4
- *
- * Deprecated: 3.10: Use #GAction and the accelerator path on an associated
- * #GtkMenu instead
- */
-void
-gtk_action_set_accel_path (GtkAction   *action, 
-                          const gchar *accel_path)
-{
-  g_return_if_fail (GTK_IS_ACTION (action));
-
-  action->private_data->accel_quark = g_quark_from_string (accel_path);
-}
-
-/**
- * gtk_action_get_accel_path:
- * @action: the action object
- *
- * Returns the accel path for this action.  
- *
- * Since: 2.6
- *
- * Returns: the accel path for this action, or %NULL
- *   if none is set. The returned string is owned by GTK+ 
- *   and must not be freed or modified.
- *
- * Deprecated: 3.10: Use #GAction and the accelerator path on an associated
- * #GtkMenu instead
- */
-const gchar *
-gtk_action_get_accel_path (GtkAction *action)
-{
-  g_return_val_if_fail (GTK_IS_ACTION (action), NULL);
-
-  if (action->private_data->accel_quark)
-    return g_quark_to_string (action->private_data->accel_quark);
-  else
-    return NULL;
-}
-
-/**
- * gtk_action_get_accel_closure:
- * @action: the action object
- *
- * Returns the accel closure for this action.
- *
- * Since: 2.8
- *
- * Returns: (transfer none): the accel closure for this action. The
- *          returned closure is owned by GTK+ and must not be unreffed
- *          or modified.
- *
- * Deprecated: 3.10: Use #GAction and #GtkMenu instead, which have no
- * equivalent for getting the accel closure
- */
-GClosure *
-gtk_action_get_accel_closure (GtkAction *action)
-{
-  g_return_val_if_fail (GTK_IS_ACTION (action), NULL);
-
-  return action->private_data->accel_closure;
-}
-
-
-/**
- * gtk_action_set_accel_group:
- * @action: the action object
- * @accel_group: (allow-none): a #GtkAccelGroup or %NULL
- *
- * Sets the #GtkAccelGroup in which the accelerator for this action
- * will be installed.
- *
- * Since: 2.4
- *
- * Deprecated: 3.10: Use #GAction and the accelerator group on an associated
- * #GtkMenu instead
- **/
-void
-gtk_action_set_accel_group (GtkAction     *action,
-                           GtkAccelGroup *accel_group)
-{
-  g_return_if_fail (GTK_IS_ACTION (action));
-  g_return_if_fail (accel_group == NULL || GTK_IS_ACCEL_GROUP (accel_group));
-  
-  if (accel_group)
-    g_object_ref (accel_group);
-  if (action->private_data->accel_group)
-    g_object_unref (action->private_data->accel_group);
-
-  action->private_data->accel_group = accel_group;
-}
-
-/**
- * gtk_action_connect_accelerator:
- * @action: a #GtkAction
- * 
- * Installs the accelerator for @action if @action has an
- * accel path and group. See gtk_action_set_accel_path() and 
- * gtk_action_set_accel_group()
- *
- * Since multiple proxies may independently trigger the installation
- * of the accelerator, the @action counts the number of times this
- * function has been called and doesn’t remove the accelerator until
- * gtk_action_disconnect_accelerator() has been called as many times.
- *
- * Since: 2.4
- *
- * Deprecated: 3.10: Use #GAction and the accelerator group on an associated
- * #GtkMenu instead
- **/
-void 
-gtk_action_connect_accelerator (GtkAction *action)
-{
-  g_return_if_fail (GTK_IS_ACTION (action));
-
-  if (!action->private_data->accel_quark ||
-      !action->private_data->accel_group)
-    return;
-
-  if (action->private_data->accel_count == 0)
-    {
-      const gchar *accel_path = 
-       g_quark_to_string (action->private_data->accel_quark);
-      
-      gtk_accel_group_connect_by_path (action->private_data->accel_group,
-                                      accel_path,
-                                      action->private_data->accel_closure);
-    }
-
-  action->private_data->accel_count++;
-}
-
-/**
- * gtk_action_disconnect_accelerator:
- * @action: a #GtkAction
- * 
- * Undoes the effect of one call to gtk_action_connect_accelerator().
- *
- * Since: 2.4
- *
- * Deprecated: 3.10: Use #GAction and the accelerator group on an associated
- * #GtkMenu instead
- **/
-void 
-gtk_action_disconnect_accelerator (GtkAction *action)
-{
-  g_return_if_fail (GTK_IS_ACTION (action));
-
-  if (!action->private_data->accel_quark ||
-      !action->private_data->accel_group)
-    return;
-
-  action->private_data->accel_count--;
-
-  if (action->private_data->accel_count == 0)
-    gtk_accel_group_disconnect (action->private_data->accel_group,
-                               action->private_data->accel_closure);
-}
-
-/**
- * gtk_action_create_menu:
- * @action: a #GtkAction
- *
- * If @action provides a #GtkMenu widget as a submenu for the menu
- * item or the toolbar item it creates, this function returns an
- * instance of that menu.
- *
- * Returns: (transfer none): the menu item provided by the
- *               action, or %NULL.
- *
- * Since: 2.12
- *
- * Deprecated: 3.10: Use #GAction and #GMenuModel instead, and create a
- * #GtkMenu with gtk_menu_new_from_model()
- */
-GtkWidget *
-gtk_action_create_menu (GtkAction *action)
-{
-  g_return_val_if_fail (GTK_IS_ACTION (action), NULL);
-
-  if (GTK_ACTION_GET_CLASS (action)->create_menu)
-    return GTK_ACTION_GET_CLASS (action)->create_menu (action);
-
-  return NULL;
-}
diff --git a/gtk/deprecated/gtkaction.h b/gtk/deprecated/gtkaction.h
deleted file mode 100644 (file)
index a105708..0000000
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * GTK - The GIMP Toolkit
- * Copyright (C) 1998, 1999 Red Hat, Inc.
- * All rights reserved.
- *
- * This Library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This Library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * Author: James Henstridge <james@daa.com.au>
- *
- * Modified by the GTK+ Team and others 2003.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __GTK_ACTION_H__
-#define __GTK_ACTION_H__
-
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
-#include <gtk/gtkwidget.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_ACTION            (gtk_action_get_type ())
-#define GTK_ACTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ACTION, GtkAction))
-#define GTK_ACTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ACTION, GtkActionClass))
-#define GTK_IS_ACTION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ACTION))
-#define GTK_IS_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ACTION))
-#define GTK_ACTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_ACTION, GtkActionClass))
-
-typedef struct _GtkAction      GtkAction;
-typedef struct _GtkActionClass GtkActionClass;
-typedef struct _GtkActionPrivate GtkActionPrivate;
-
-struct _GtkAction
-{
-  GObject object;
-
-  /*< private >*/
-  GtkActionPrivate *private_data;
-};
-
-/**
- * GtkActionClass:
- * @parent_class: The parent class.
- * @activate: Signal emitted when the action is activated.
- */
-struct _GtkActionClass
-{
-  GObjectClass parent_class;
-
-  /*< public >*/
-
-  /* activation signal */
-  void       (* activate)           (GtkAction    *action);
-
-  /*< private >*/
-
-  GType      menu_item_type;
-  GType      toolbar_item_type;
-
-  /* widget creation routines (not signals) */
-  GtkWidget *(* create_menu_item)   (GtkAction *action);
-  GtkWidget *(* create_tool_item)   (GtkAction *action);
-  void       (* connect_proxy)      (GtkAction *action,
-                                    GtkWidget *proxy);
-  void       (* disconnect_proxy)   (GtkAction *action,
-                                    GtkWidget *proxy);
-
-  GtkWidget *(* create_menu)        (GtkAction *action);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GDK_DEPRECATED_IN_3_10
-GType        gtk_action_get_type               (void) G_GNUC_CONST;
-GDK_DEPRECATED_IN_3_10
-GtkAction   *gtk_action_new                    (const gchar *name,
-                                               const gchar *label,
-                                               const gchar *tooltip,
-                                               const gchar *stock_id);
-GDK_DEPRECATED_IN_3_10
-const gchar* gtk_action_get_name               (GtkAction     *action);
-GDK_DEPRECATED_IN_3_10
-gboolean     gtk_action_is_sensitive           (GtkAction     *action);
-GDK_DEPRECATED_IN_3_10
-gboolean     gtk_action_get_sensitive          (GtkAction     *action);
-GDK_DEPRECATED_IN_3_10
-void         gtk_action_set_sensitive          (GtkAction     *action,
-                                               gboolean       sensitive);
-GDK_DEPRECATED_IN_3_10
-gboolean     gtk_action_is_visible             (GtkAction     *action);
-GDK_DEPRECATED_IN_3_10
-gboolean     gtk_action_get_visible            (GtkAction     *action);
-GDK_DEPRECATED_IN_3_10
-void         gtk_action_set_visible            (GtkAction     *action,
-                                               gboolean       visible);
-GDK_DEPRECATED_IN_3_10
-void         gtk_action_activate               (GtkAction     *action);
-GDK_DEPRECATED_IN_3_10
-GtkWidget *  gtk_action_create_icon            (GtkAction     *action,
-                                               GtkIconSize    icon_size);
-GDK_DEPRECATED_IN_3_10
-GtkWidget *  gtk_action_create_menu_item       (GtkAction     *action);
-GDK_DEPRECATED_IN_3_10
-GtkWidget *  gtk_action_create_tool_item       (GtkAction     *action);
-GDK_DEPRECATED_IN_3_10
-GtkWidget *  gtk_action_create_menu            (GtkAction     *action);
-GDK_DEPRECATED_IN_3_10
-GSList *     gtk_action_get_proxies            (GtkAction     *action);
-GDK_DEPRECATED_IN_3_10
-void         gtk_action_connect_accelerator    (GtkAction     *action);
-GDK_DEPRECATED_IN_3_10
-void         gtk_action_disconnect_accelerator (GtkAction     *action);
-GDK_DEPRECATED_IN_3_10
-const gchar *gtk_action_get_accel_path         (GtkAction     *action);
-GDK_DEPRECATED_IN_3_10
-GClosure    *gtk_action_get_accel_closure      (GtkAction     *action);
-GDK_DEPRECATED_IN_3_10
-void         gtk_action_block_activate         (GtkAction     *action);
-GDK_DEPRECATED_IN_3_10
-void         gtk_action_unblock_activate       (GtkAction     *action);
-
-void         _gtk_action_add_to_proxy_list     (GtkAction     *action,
-                                               GtkWidget     *proxy);
-void         _gtk_action_remove_from_proxy_list(GtkAction     *action,
-                                               GtkWidget     *proxy);
-
-/* protected ... for use by child actions */
-void         _gtk_action_emit_activate         (GtkAction     *action);
-
-/* protected ... for use by action groups */
-GDK_DEPRECATED_IN_3_10
-void         gtk_action_set_accel_path         (GtkAction     *action,
-                                               const gchar   *accel_path);
-GDK_DEPRECATED_IN_3_10
-void         gtk_action_set_accel_group        (GtkAction     *action,
-                                               GtkAccelGroup *accel_group);
-void         _gtk_action_sync_menu_visible     (GtkAction     *action,
-                                               GtkWidget     *proxy,
-                                               gboolean       empty);
-
-GDK_DEPRECATED_IN_3_10
-void                  gtk_action_set_label              (GtkAction   *action,
-                                                         const gchar *label);
-GDK_DEPRECATED_IN_3_10
-const gchar *         gtk_action_get_label              (GtkAction   *action);
-GDK_DEPRECATED_IN_3_10
-void                  gtk_action_set_short_label        (GtkAction   *action,
-                                                         const gchar *short_label);
-GDK_DEPRECATED_IN_3_10
-const gchar *         gtk_action_get_short_label        (GtkAction   *action);
-GDK_DEPRECATED_IN_3_10
-void                  gtk_action_set_tooltip            (GtkAction   *action,
-                                                         const gchar *tooltip);
-GDK_DEPRECATED_IN_3_10
-const gchar *         gtk_action_get_tooltip            (GtkAction   *action);
-GDK_DEPRECATED_IN_3_10
-void                  gtk_action_set_stock_id           (GtkAction   *action,
-                                                         const gchar *stock_id);
-GDK_DEPRECATED_IN_3_10
-const gchar *         gtk_action_get_stock_id           (GtkAction   *action);
-GDK_DEPRECATED_IN_3_10
-void                  gtk_action_set_gicon              (GtkAction   *action,
-                                                         GIcon       *icon);
-GDK_DEPRECATED_IN_3_10
-GIcon                *gtk_action_get_gicon              (GtkAction   *action);
-GDK_DEPRECATED_IN_3_10
-void                  gtk_action_set_icon_name          (GtkAction   *action,
-                                                         const gchar *icon_name);
-GDK_DEPRECATED_IN_3_10
-const gchar *         gtk_action_get_icon_name          (GtkAction   *action);
-GDK_DEPRECATED_IN_3_10
-void                  gtk_action_set_visible_horizontal (GtkAction   *action,
-                                                         gboolean     visible_horizontal);
-GDK_DEPRECATED_IN_3_10
-gboolean              gtk_action_get_visible_horizontal (GtkAction   *action);
-GDK_DEPRECATED_IN_3_10
-void                  gtk_action_set_visible_vertical   (GtkAction   *action,
-                                                         gboolean     visible_vertical);
-GDK_DEPRECATED_IN_3_10
-gboolean              gtk_action_get_visible_vertical   (GtkAction   *action);
-GDK_DEPRECATED_IN_3_10
-void                  gtk_action_set_is_important       (GtkAction   *action,
-                                                         gboolean     is_important);
-GDK_DEPRECATED_IN_3_10
-gboolean              gtk_action_get_is_important       (GtkAction   *action);
-GDK_DEPRECATED_IN_3_10
-void                  gtk_action_set_always_show_image  (GtkAction   *action,
-                                                         gboolean     always_show);
-GDK_DEPRECATED_IN_3_10
-gboolean              gtk_action_get_always_show_image  (GtkAction   *action);
-
-
-G_END_DECLS
-
-#endif  /* __GTK_ACTION_H__ */
index aa3c5ca81eac68af434d8c1a2613ce236db15e19..598f04f064244f9bb85b447a79ff01593eb546ca 100644 (file)
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
 #include <gtk/gtkwindowgroup.h>
 
 #ifndef GTK_DISABLE_DEPRECATED
-#include <gtk/deprecated/gtkaction.h>
 #include <gtk/deprecated/gtkgradient.h>
 #include <gtk/deprecated/gtksymboliccolor.h>
 #endif /* GTK_DISABLE_DEPRECATED */
index a59e84bb6cca0a679d56e586de945c5af5d1899e..30e1be427164a9f4ff9641fb0fbfe9f70abf4f76 100644 (file)
@@ -19,7 +19,6 @@
 #define __GTK_MENU_ITEM_PRIVATE_H__
 
 #include <gtk/gtkmenuitem.h>
-#include <gtk/deprecated/gtkaction.h>
 #include <gtk/gtkactionhelper.h>
 #include <gtk/gtkcssgadgetprivate.h>
 #include <gtk/gtkcssnodeprivate.h>
index 3dde3a086f6408ffaa51077e09dfed921dca7c85..0ea22f305d18b96d20107ae9e0e175bab0d8ba72 100644 (file)
@@ -34,7 +34,6 @@ TESTS_ENVIRONMENT = \
 TEST_PROGS +=                  \
        accel                   \
        accessible              \
-       action                  \
        adjustment              \
        bitmask                 \
        builder                 \
diff --git a/testsuite/gtk/action.c b/testsuite/gtk/action.c
deleted file mode 100644 (file)
index 61631d9..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-/* GtkAction tests.
- *
- * Authors: Jan Arne Petersen <jpetersen@openismus.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#define GDK_DISABLE_DEPRECATION_WARNINGS
-#include <gtk/gtk.h>
-
-/* Fixture */
-
-typedef struct
-{
-  GtkAction *action;
-} ActionTest;
-
-static void
-action_test_setup (ActionTest    *fixture,
-                   gconstpointer  test_data)
-{
-  fixture->action = gtk_action_new ("name", "label", NULL, NULL);
-}
-
-static void
-action_test_teardown (ActionTest    *fixture,
-                      gconstpointer  test_data)
-{
-  g_object_unref (fixture->action);
-}
-
-static void
-notify_count_emmisions (GObject    *object,
-                       GParamSpec *pspec,
-                       gpointer    data)
-{
-  unsigned int *i = data;
-  (*i)++;
-}
-
-static void
-menu_item_label_notify_count (ActionTest    *fixture,
-                              gconstpointer  test_data)
-{
-  GtkWidget *item = gtk_menu_item_new ();
-  unsigned int emmisions = 0;
-
-  g_object_ref_sink (item);
-  g_signal_connect (item, "notify::label",
-                   G_CALLBACK (notify_count_emmisions), &emmisions);
-
-  g_object_unref (item);
-}
-
-/* main */
-
-int
-main (int    argc,
-      char **argv)
-{
-  gtk_test_init (&argc, &argv, NULL);
-
-  g_test_add ("/Action/MenuItem/label-notify-count",
-              ActionTest, NULL,
-              action_test_setup,
-              menu_item_label_notify_count,
-              action_test_teardown);
-
-  return g_test_run ();
-}
-
index f2a01f399a88f3bde86d2f2f2d947ec36df8a12c..cf5b1f4125bb5482ac5a2bb3c274b36a33943ba2 100644 (file)
@@ -1921,13 +1921,8 @@ test_add_objects (void)
   GError *error;
   gint ret;
   GObject *obj;
-  GtkWidget *menubar;
-  GObject *menu, *label;
-  GList *children;
   gchar *objects[2] = {"mainbox", NULL};
   gchar *objects2[3] = {"mainbox", "window2", NULL};
-  gchar *objects3[3] = {"uimgr1", "menubar1"};
-  gchar *objects4[2] = {"uimgr1", NULL};
   const gchar buffer[] =
     "<interface>"
     "  <object class=\"GtkWindow\" id=\"window\">"